Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 10 Nov 2011 07:57:29 +0000 (23:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 10 Nov 2011 07:57:29 +0000 (23:57 -0800)

Trivial merge